Fix for marking days from Dan Reish <dreish@izzy.net>.

Thu Nov 19 23:47:38 CST 1998 Shawn T. Amundson <amundson@gtk.org>

        * gtk/gtkcalendar.c: Fix for marking days from
	  Dan Reish <dreish@izzy.net>.

diff --git a/ChangeLog b/ChangeLog
index 92a801b9bea195126ec98b400c0cd6a093460b74..3166b039fa3dbb403f99e6157c852e51d693b03c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Nov 19 23:47:38 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * gtk/gtkcalendar.c: Fix for marking days from 
+         Dan Reish <dreish@izzy.net>.
+
 Thu Nov 19 00:15:27 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkctree.c (gtk_ctree_node_nth): return the nth GtkCTreeNode

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 92a801b9bea195126ec98b400c0cd6a093460b74..3166b039fa3dbb403f99e6157c852e51d693b03c 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,8 @@
+Thu Nov 19 23:47:38 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * gtk/gtkcalendar.c: Fix for marking days from 
+         Dan Reish <dreish@izzy.net>.
+
 Thu Nov 19 00:15:27 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkctree.c (gtk_ctree_node_nth): return the nth GtkCTreeNode

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 92a801b9bea195126ec98b400c0cd6a093460b74..3166b039fa3dbb403f99e6157c852e51d693b03c 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+Thu Nov 19 23:47:38 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * gtk/gtkcalendar.c: Fix for marking days from 
+         Dan Reish <dreish@izzy.net>.
+
 Thu Nov 19 00:15:27 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkctree.c (gtk_ctree_node_nth): return the nth GtkCTreeNode

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 92a801b9bea195126ec98b400c0cd6a093460b74..3166b039fa3dbb403f99e6157c852e51d693b03c 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,8 @@
+Thu Nov 19 23:47:38 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * gtk/gtkcalendar.c: Fix for marking days from 
+         Dan Reish <dreish@izzy.net>.
+
 Thu Nov 19 00:15:27 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkctree.c (gtk_ctree_node_nth): return the nth GtkCTreeNode

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 92a801b9bea195126ec98b400c0cd6a093460b74..3166b039fa3dbb403f99e6157c852e51d693b03c 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+Thu Nov 19 23:47:38 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * gtk/gtkcalendar.c: Fix for marking days from 
+         Dan Reish <dreish@izzy.net>.
+
 Thu Nov 19 00:15:27 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkctree.c (gtk_ctree_node_nth): return the nth GtkCTreeNode

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 92a801b9bea195126ec98b400c0cd6a093460b74..3166b039fa3dbb403f99e6157c852e51d693b03c 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+Thu Nov 19 23:47:38 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * gtk/gtkcalendar.c: Fix for marking days from 
+         Dan Reish <dreish@izzy.net>.
+
 Thu Nov 19 00:15:27 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkctree.c (gtk_ctree_node_nth): return the nth GtkCTreeNode

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 92a801b9bea195126ec98b400c0cd6a093460b74..3166b039fa3dbb403f99e6157c852e51d693b03c 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+Thu Nov 19 23:47:38 CST 1998 Shawn T. Amundson <amundson@gtk.org>
+
+       * gtk/gtkcalendar.c: Fix for marking days from 
+         Dan Reish <dreish@izzy.net>.
+
 Thu Nov 19 00:15:27 1998  Lars Hamann  <lars@gtk.org>
 
        * gtk/gtkctree.c (gtk_ctree_node_nth): return the nth GtkCTreeNode

diff --git a/gtk/gtkcalendar.c b/gtk/gtkcalendar.c
index af6ef3ac6a87c4cd023e4fc81a1e9f2106a353c3..5b618a0e6f288cac189692741b0056c850d7ff78 100644 (file)
--- a/gtk/gtkcalendar.c
+++ b/gtk/gtkcalendar.c
@@ -1877,7 +1877,8 @@ gtk_calendar_paint_day (GtkWidget *widget,
   gdk_draw_string (private_data->main_win,
                   DAY_FONT (widget), gc,
                   x_loc, y_baseline, buffer);
-  if (calendar->marked_date[day-1])
+  if (calendar->marked_date[day-1]
+      && calendar->day_month[row][col] == MONTH_CURRENT)
     gdk_draw_string (private_data->main_win,
                     DAY_FONT (widget), gc,
                     x_loc-1, y_baseline, buffer);